refactoring

4 files changed, 16 insertions, 26 deletions

diff --git a/src/routes/[username]/settings/+page.svelte b/src/routes/[username]/settings/+page.svelte
index 978f537a..410ed1bf 100644
--- a/src/routes/[username]/settings/+page.svelte
+++ b/src/routes/[username]/settings/+page.svelte
@@ -3,7 +3,7 @@
 	import Pos from './_pos.svelte';
 	import Security from './_security.svelte';
 
-	import { AppHeader, Icon } from '$comp';
+	import { Icon } from '$comp';
 	import { t } from '$lib/translations';
 	import { failure, success, put } from '$lib/utils';
 	import { user, avatarUpload, bannerUpload } from '$lib/store';
@@ -35,8 +35,6 @@
 	};
 </script>
 
-<AppHeader />
-
 <form on:submit|preventDefault={save} class="mb-[154px]">
 	<div class="mt-24 mb-20 px-3 md:px-0 w-full md:w-[400px] mx-auto space-y-8">
 		<h1 class="text-center text-3xl md:text-4xl font-semibold mb-10">
diff --git a/src/routes/[username]/settings/_account.svelte b/src/routes/[username]/settings/_account.svelte
index ff7676f4..8a20df43 100644
--- a/src/routes/[username]/settings/_account.svelte
+++ b/src/routes/[username]/settings/_account.svelte
@@ -1,13 +1,6 @@
 <script>
 	import { tick } from 'svelte';
-	import {
-		user,
-		colorTheme,
-		rates,
-		tempProfileFiles,
-		avatarUpload,
-		bannerUpload
-	} from '$lib/store';
+	import { colorTheme, tempProfileFiles, avatarUpload, bannerUpload } from '$lib/store';
 	import { Icon, Toggle, LocaleSelector } from '$comp';
 	import { t } from '$lib/translations';
 	import { upload } from '$lib/upload';
@@ -58,7 +51,7 @@
 		}
 	};
 
-	$: $user.password = $user.confirm = password;
+	$: user.password = user.confirm = password;
 </script>
 
 <div>
@@ -69,13 +62,13 @@
 <!-- TODO
 <div>
 	<label for="email" class="font-bold mb-1 block">{$t('user.settings.email')}</label>
-	<input type="email" name="email" bind:value={$user.email} />
+	<input type="email" name="email" bind:value={user.email} />
 </div> -->
 
 <!-- TODO fix breaking changes when user updates this field -->
 <div>
 	<label for="username" class="font-bold mb-1 block">{$t('user.settings.username')}</label>
-	<input disabled type="text" name="username" bind:value={$user.username} />
+	<input disabled type="text" name="username" bind:value={user.username} />
 </div>
 
 <div class="relative">
@@ -96,7 +89,7 @@
 
 <div>
 	<label for="address" class="font-bold mb-1 block">{$t('user.settings.businessAddress')}</label>
-	<input type="text" name="address" bind:value={$user.address} />
+	<input type="text" name="address" bind:value={user.address} />
 </div>
 
 <!-- TODO -->
@@ -133,13 +126,13 @@
 					class="absolute w-full h-full object-cover object-center visible overflow-hidden"
 				/>
 			</div>
-		{:else if $user.profile}
+		{:else if user.profile}
 			<div
 				class="relative rounded-full overflow-hidden text-center w-20 h-20 my-auto hover:opacity-80 cursor-pointer"
 				on:click={() => select('profile')}
 			>
 				<img
-					src={`/api/public/${$user.username}-profile.png`}
+					src={`/api/public/${user.username}-profile.png`}
 					class="absolute w-full h-full object-cover object-center visible overflow-hidden"
 				/>
 			</div>
@@ -183,9 +176,9 @@
 			class="w-full object-cover object-center visible overflow-hidden h-48 mb-4 hover:opacity-80"
 			on:click={() => select('banner')}
 		/>
-	{:else if $user.banner}
+	{:else if user.banner}
 		<img
-			src={`/api/public/${$user.username}-banner.png`}
+			src={`/api/public/${user.username}-banner.png`}
 			class="w-full object-cover object-center visible overflow-hidden h-48 mb-4 hover:opacity-80"
 			on:click={() => select('banner')}
 		/>
diff --git a/src/routes/[username]/settings/_pos.svelte b/src/routes/[username]/settings/_pos.svelte
index 3310e426..edf54d91 100644
--- a/src/routes/[username]/settings/_pos.svelte
+++ b/src/routes/[username]/settings/_pos.svelte
@@ -1,5 +1,4 @@
 <script>
-	import { rates, user } from '$lib/store';
 	import { Icon, Toggle } from '$comp';
 	import { t } from '$lib/translations';
 	import { success, failure, put } from '$lib/utils';
diff --git a/src/routes/[username]/settings/_security.svelte b/src/routes/[username]/settings/_security.svelte
index 1b8fb125..3c0009dc 100644
--- a/src/routes/[username]/settings/_security.svelte
+++ b/src/routes/[username]/settings/_security.svelte
@@ -32,7 +32,7 @@
 			if (setting2fa && token.length === 6) {
 				await put('/enable2fa', { token });
 				success('2FA enabled');
-				$user.twofa = 1;
+				user.twofa = 1;
 				toggleEnabling();
 			}
 		} catch (e) {
@@ -46,7 +46,7 @@
 			if (disabling2fa && token.length === 6) {
 				await put('/disable2fa', { token });
 				success('2FA disabled');
-				$user.twofa = 0;
+				user.twofa = 0;
 				toggleDisabling();
 			}
 		} catch (e) {
@@ -54,7 +54,7 @@
 		}
 	};
 
-	$: otpUri = `otpauth://totp/coinos:${$user.username}?secret=${$user.otpsecret}&period=30&digits=6&algorithm=SHA1&issuer=coinos`;
+	$: otpUri = `otpauth://totp/coinos:${user.username}?secret=${user.otpsecret}&period=30&digits=6&algorithm=SHA1&issuer=coinos`;
 </script>
 
 <!-- TODO
@@ -66,7 +66,7 @@
 	{#if settingPin}
 		<div class="flex my-4">
 			<div class="mx-auto">
-				<Pincode bind:code bind:value={$user.pin} bind:this={pinInput}>
+				<Pincode bind:code bind:value={user.pin} bind:this={pinInput}>
 					<PincodeInput />
 					<PincodeInput />
 					<PincodeInput />
@@ -110,7 +110,7 @@
 
 		<div class="text-center my-4">
 			{$t('user.settings.accountId')}<br />
-			<b>{$user.otpsecret}</b>
+			<b>{user.otpsecret}</b>
 		</div>
 
 		<div class="text-center my-4">
@@ -136,7 +136,7 @@
 				<PincodeInput />
 			</Pincode>
 		</div>
-	{:else if $user.twofa}
+	{:else if user.twofa}
 		<button type="button" class="primary" on:click={toggleDisabling}>
 			<Icon icon="mobile" style="mr-1" />
 			{$t('user.settings.twofaDisable')}